Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 16:16:05 +0000 (09:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 16:16:05 +0000 (09:16 -0700)
commit9f5cf04ac722abbdc71b95f8921f7d7fe2bf76d6
tree1cb542be6894fafe63e85f1ff07d8384329390dd
parent19fe97ff28e4d08e3d4f88162de519baddda1198
parentcd661b97b4f57935bf77cacb7cc18fbcb015ca4b
Merge from trunk.